Merge.
authoradsharma@los-vmm.sc.intel.com <adsharma@los-vmm.sc.intel.com>
Tue, 23 Aug 2005 19:03:21 +0000 (12:03 -0700)
committeradsharma@los-vmm.sc.intel.com <adsharma@los-vmm.sc.intel.com>
Tue, 23 Aug 2005 19:03:21 +0000 (12:03 -0700)
commit19bb5236ef150fad243d075df88ccbd2abeba637
treed23efd0e434661c1d43cea6edc0193975e8b0785
parent543079029cb6841ee7a0ee29a8ea78d60dcd39d4
parent772d38c9209e0879a75091a7dee985411b968314
Merge.
xen/arch/x86/vmx.c